Fix implementation, add screenshot