resolved the latest issues