reworking this junk!!!!!!!!