Fixed issues 1 and 3