Working, removed unecessary junk