changing to haml still