need to change and arrange other things