Continue on the work done at GSOC 2009