Added solution once again, this time cleaner
Fixed small issues