updated to new designs