or maybe i'll just merge this part ?