CHANGED:try to fix it up as previouse mentioned