Finished up behavior changes