A little bit fixed, more will be done later