updated...stuff I guess