working again, new features