worked further on further mapping