* updated to latest features