updated import and source functions