Fixing and Own-ifying..