updated to new desing