Changed returns from function