Amend for OctOS