A set of changes to finalize the code