Minor Changes. STILL WORKING.