Some Changes

Finally works out