Initial changes from class