rearranging some scripts