updated to basic version