My solution to the above is this, btw