added almost features for me