made solution a lot better