Stap 1 fixes - beginning