Adding more functions: Version 0.05