worked on further mapping