Added comments for further development, Corrected design