reworking this sorry :)