More tweaks and Index added