changed according new desing