Fixes the Issues #4,5,6