some updated
working on this