changed function names to unique ones