Working and Fixes