Basic functionality fixed