Added final code for Alpha Release