Merged Antono's changes