Update 2

Fixed issues