final commit before Swift conversion