You are right, that was just something quick and dirty