Made attendance save more efficient for issue #8
Fixed conflicts