Update after major overhaul