Restructured couple of things itno lists