Checking off Stojan's requests