including all fixes