add straight handling