All added and tested