Updates by Bilicek