Fixes #1, now using only one object