reflect changes from jkuetemeier