modified a few thigns to streemline stuff