Kaiser: changed enviornment to be more generic