Need to stop committing that stupid method