Added the things mentioned by scott