merged some shits