hacking and fixing stuff =)