Updated with some new stuff