moved haml