updated for fixing issues