Functions transferred to appropriate file