changes from dev kyrz