Cleaned up shib strategy