moving out code and updates