Adding changes missing in previous push