updated with new stuff and wants