work on final
cont. work on final