more refactoring...
640 pixels wide pleasey