More changes to make it usable