lots of changes, not yet updated to MC 1.5