removign returns because, I don't know why