accounting for Davids HAML suggestions