added mores stuff