Added few adjustments.