refactored for Lucia