workin on xcode-friendliness