adding more instructions, removed some old code