Version 2a. small edits