Added functionality and fixed TZ bug