modified to simply make