Modifications made @ zees on 29-10-2013