This is a bit shorter. It was ok before anyway ;)