Updated with some extras