Working on deployment -2