more styling
add check logic
future version