Added boolean returns indicating things