General commit for modified classes 

These changes were likely added for the sake of the timeouts