did a lot of haml changes