more code changes for issue tracker...