Commit Four

Includes change made on office PC