Shashank Addition and Fixes