comment out extra logic to fix apply issue for now. need to look further into it