arrow class and platform modifications