expanded entry functionality