updated to a bit newer components