Some tweaks.
Update to a more classical approach