fix zoom issue. Finished