Applied changes as requested by @jebyrnes