moved two functions