Some extra changes