rearranging for deploy