Fork of Frodef's MOVITZ code