better way of adding shiv