#12 Working version of the template