Continued work on final functions**