review considered and function moved to the right place