fixed upcoming features