resolved few issues