Fixed the methods