Updated to the latest and greatest bits of amrita