more work on code