Updated recent changes