Adding more F17 hack code