New Implementation, better timing