Third commit - static conversion