removed temp stuff