some changes towards final solution....