Production Ready Part-2