added small changes from class