edited span and todo