Final Version

Major Issues fixed..