updated to new stuff