Added two methods. Removed the 'inline' keyword for some methods.