Updated and down sized