Some little tweaks to make it runnable :)