Modified Aimer, Controller and Server class