Added new files and behaviour. Also, it's not about undefined behaviour anymore.