version 21 with some bug fixes