Made changes to ready for initial deployment - Ver. 0.44