With Marko's changes