Code ready, final commit