updated for new skadi