Finished up to extensions according to the tutorial