using the wrong helpers
now using some better helpers