Changed scheme and added review