Some working changes