Added in some of Rocky's changes