some more changes, you were here to guide me through them