Update with TeaJizzle's changes