[master]: Enchanced single threaded version