Swamy | Updated with deletion of unused method