added mapping stuff