Commit for Erik to get current code