fixed: functions that has been moved.