final addition pre merge