Added some subtle features