address performance issues
add translations