Added basic functions together