moved stuff for solder compatibility