First stab - rembrandt livery fix