Incremented version, fixed solenoid variables