Some added changes