Made things return cause it is smarter!