#1: changes to fix issues