Made main consistent