removed d and haml