Some changes and added -a/-A