Gsoc week 12 and 13