added buggy zoom
merged with tony
merged