Started work on Re-code/ Version 2