updated to fix issues