added and finished