Should remove temporary code