Enhanced system (38/46)

Enhanced system