Renamed 'Done' and 'Side' to 'Return' and 'Effect'