Made things nicer