more progress on buddy system