reimplemented removal of "temp"