moved all functions