Fixed issues, works better