updated for new jsx