Made some changes to allow deployment