improved showcase code