I should test before commiting changes i feel... #3