Some functions completed