Added ugly way to do things