Reworked some return values