test updated, work in progress