Made things slightly simpler