updated basic classes