update cleaned up and added second screen