Redo my noob changes