importing mario's changes and updates