more more core functionality updated