Updated software design