Further work on implementation