changed stuff around to give apps more options