syntax fix
more framework flexibility