some tweaking to hack it