Final changes. Answer revealing added back