Made things a little bit less GNU