Simpler refactoring done
filling screen with phase 1