Updated Partially working Maekawa