Moved some functionality