fixed up helpers