now working mapping