bug fixes, performance improvement and removal of unnecessary parameter