Changed main program and props