making it look good again - roll back to rev. 2