Second commit with some fixed methods and getPoints