Updated with more statsonice code