Added more to SWeight