More work on implementation part.