Got return values working properly