Trying to address issues 2 and 3