okay, trying to improve this still...