sorted out all issues