Clear working, checkValid, Years fix