Refactured some of OSAP and a self install feature in the application to as well