added flick support. Still not perfect.