modifications to make it screen compatible
modifications to make it screen compatible
refactor round two