changed things into one program