Removed hybrid, added tmax option