added fix for different engineer views v1