Further worked on the next part