got rid of temp code and moved a call