Tweaked some things for a new application