Fixes all method to be as intended