Data Analysis: Modifications for deployment