DJR:Deactivated non-working code and added proper form