hopefuly final, sorry for a delay