slight tweaks to bring the initial project closer to the old final