Added 'old' parameter, modified modules