Small adjustments to challenge2