more hacks =)