Temporary remove Zack,s changes, need this for testing