Enhanced system (25/46)

Enhanced system