Made it half-way working again