Some small modifications at desing