Simple working solution
Fix merge conflict, add my solution