intermediate commit... changing platforms