Basic functionality update 2.