Updated temp code (still disabled)