Changes again
Fixed issues