cleaned up methods so to allow better flow for apps