updated to current design