Added the final changes from designer