name/logic fix