reverted to current design