Final code for Release Candidate