Stojan's changes