Addressed all threads, please review