Everything is correct now in all procedures