Changed scheme a bit