finalized work by shaho