Updated recent changes made by Denis