Made it a bit less rubish