Fixed methods and be more verbose