updated with last dev snapshot