Feature/reimplement temp