several changes to test functionality