Extionsion added and some validation commented that was not working properly yet