Incorporate velocity & ETC