more updates but not finished or tested