Redone with haml generators