More helpers
Slight update to helpers