Removed inline functions