Additional features completed