indenting
Reduce number of updates
strippping out stuff, rfid back on