Addressed issues
28,
29
31
32,
36