Took a long time to get this working properly