30 min commit. Working