Cleaned up skippable feature