#293 Updated implementation