Adjusted the solution a setup I like