removed template. fixed stuff