Solved, ugly
tidy up