Optimizations to AMOEBA