Make better for Terminals