a bit less ugly in some ways