Make last two commits actually working