Added final changes for uploaded version