modified few issues with compliance