Srinis changes

Along with some additions